Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Global indentation options #59679

Merged
merged 7 commits into from
Mar 15, 2022
Merged

Global indentation options #59679

merged 7 commits into from
Mar 15, 2022

Conversation

tmat
Copy link
Member

@tmat tmat commented Feb 21, 2022 •
edited
Loading

Removes IInferredIndentationService - moves the call to IIndentationManagerService to the callers that are in Editor Features.

Makes the following options global:

  • AutoFromattingOptions
  • DocumentCommentOptions
  • IndentationOptions
  • BraceMatchingOptions
  • ExtractMethodOptions
  • HighlightingOptions

Follow up Razor PR: dotnet/razor#6166

@tmat tmat force-pushed the GlobalIndentationOptions branch 2 times, most recently from 64ff0f7 to dd7b8c9 Compare February 23, 2022 19:07
@runfoapp runfoapp bot mentioned this pull request Feb 23, 2022
Closed
@tmat tmat force-pushed the GlobalIndentationOptions branch from fe29a88 to 0a38518 Compare March 9, 2022 22:57
@tmat tmat mentioned this pull request Mar 10, 2022
Merged
1 task
tmat
tmat commented Mar 10, 2022
View reviewed changes
src/Tools/ExternalAccess/Razor/RazorCSharpFormattingInteractionService.cs
/// True if this service would like to format the document based on the user typing the
/// provided character.
/// </summary>
public static bool SupportsFormattingOnTypedCharacter(Document document, char ch)
Copy link
Member Author

@tmat tmat Mar 10, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SupportsFormattingOnTypedCharacter

Unused by Razor

@tmat
Copy link
Member Author

tmat commented Mar 10, 2022

/azp run roslyn-integration-CI

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@tmat tmat marked this pull request as ready for review March 13, 2022 17:01
@tmat tmat requested review from 333fred, JoeRobich and a team as code owners March 13, 2022 17:01
@tmat
Copy link
Member Author

tmat commented Mar 14, 2022 •
edited
Loading

@CyrusNajmabadi @jasonmalinowski PTAL

333fred
333fred approved these changes Mar 14, 2022
View reviewed changes
Copy link
Member

@333fred 333fred left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O# change LGTM

davidwengier
davidwengier approved these changes Mar 15, 2022
View reviewed changes
Copy link
Contributor

@davidwengier davidwengier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So clean

jasonmalinowski
jasonmalinowski reviewed Mar 15, 2022
View reviewed changes
Copy link
Member

@jasonmalinowski jasonmalinowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments so far, just didn't want to sit on these while having to step away for a bit.

...ces/SharedUtilitiesAndExtensions/Compiler/CSharp/Formatting/CSharpSyntaxFormattingOptions.cs Show resolved Hide resolved
src/Workspaces/Core/Portable/Formatting/FormattingOptions.cs Show resolved Hide resolved
src/Features/Core/Portable/DocumentationComments/DocumentationCommentOptions.cs Show resolved Hide resolved
src/EditorFeatures/TestUtilities/DocumentationComments/AbstractDocumentationCommentTests.cs Show resolved Hide resolved
src/Features/CSharp/Portable/ConvertNamespace/ConvertNamespaceTransform.cs Show resolved Hide resolved
...CSharp/Portable/ConvertToRawString/ConvertRegularStringToRawStringCodeRefactoringProvider.cs Show resolved Hide resolved
src/Features/CSharp/Portable/SplitStringLiteral/InterpolatedStringSplitter.cs Show resolved Hide resolved
src/Features/Core/Portable/Options/DocumentationCommentOptionsStorage.cs Show resolved Hide resolved
src/Features/Core/Portable/Wrapping/AbstractCodeActionComputer.cs Show resolved Hide resolved
...Features/Core/Portable/Wrapping/SeparatedSyntaxList/SeparatedSyntaxListCodeActionComputer.cs Outdated Show resolved Hide resolved
@tmat tmat enabled auto-merge (squash) March 15, 2022 15:43
@tmat tmat merged commit 5fd5e5b into dotnet:main Mar 15, 2022
@ghost ghost added this to the Next milestone Mar 15, 2022
allisonchou added a commit to allisonchou/roslyn that referenced this pull request Mar 16, 2022
@allisonchou
Revert "Global indentation options (dotnet#59679)"
04a847e 
This reverts commit 5fd5e5b.
allisonchou added a commit that referenced this pull request Mar 17, 2022
@allisonchou
Revert "Global indentation options (#59679)" (#60199)
ab57ce8 
This reverts commit 5fd5e5b.
@allisonchou allisonchou modified the milestones: Next, 17.2.P3 Mar 28, 2022
tmat added a commit to tmat/roslyn that referenced this pull request Apr 4, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
307238b 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 7, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
fdeec42 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 7, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
a4f8367 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 7, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
358c820 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 7, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
9a401e9 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 7, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
55379a8 
)"

This reverts commit ab57ce8.
@tmat tmat mentioned this pull request Apr 7, 2022
Merged
tmat added a commit to tmat/roslyn that referenced this pull request Apr 8, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
99cadf4 
)"

This reverts commit ab57ce8.
tmat added a commit to tmat/roslyn that referenced this pull request Apr 8, 2022
@tmat
Revert "Revert "Global indentation options (dotnet#59679)" (dotnet#60199
e6ffa3e 
)"

This reverts commit ab57ce8.
tmat added a commit that referenced this pull request Apr 9, 2022
@tmat
Global indentation options - take 2 (#60565)
0c7c0b3 
* Revert "Revert "Global indentation options (#59679)" (#60199)"

This reverts commit ab57ce8.

* Move IFormattingInteractionService to Editor Features and add inferred indentation detection to its implementation.
Move GetFormattingChangesOnTypedCharacterAsync, GetFormattingChangesOnPasteAsync to ISyntaxFormattingService - these do not depend on the editor.

* Test fix
333fred added a commit that referenced this pull request Apr 11, 2022
@333fred @CyrusNajmabadi
@JoeRobich @DoctorKrolic @dibarbet @Youssef1313 @mavasani @jasonmalinowski @RikkiGibson @allisonchou @sharwell @tmat @jcouv @meziantou @jmarolf @dotnet-maestro @cston
Merge main to features/required-members (#60674)
b0798f4 
* Simplify

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Excluded Task.CompletionTask from completion list in async member declarations

* Fix merge

* Use existing assert

* Use correct assert

* Use isInferred: false when creating BoundArrayInitialization in CreateUTF8ByteRepresentation

* Move few 'CodeFixProvider's to Analyzers layer

* Fix

* Fix

* Remove ForegroundThreadAffinitizedObject usage

* fix

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Remove ForegroundThreadAffinitizedObject usage

* Revert bad changes

* Fix errors and remove a hard CodeFixProvider back to Features

* Update projitems

* Move tests

* Remove unused abstract property

* Remove the single unused read of CodeFixCategory

* Remove overrides in Analyzers

* Remove overrides in Features

* Fixed char recomendations test

* Got rid of AsyncModifierName constants

* Remove unnecessary `<Compile Remove`

* Fixed tests for all other keywords

* Cleaned up keyword tests

* Move formatting analyzer to shared Analyzers layer

* Move tests to shared Analyzers layer and more other fixes

* Few more fixes

* Fix bad changes

* Fix bad changes

* Fix bad changes

* Remove IVTs of deleted test projects

* Address review comment

* Fix failing test

* Cleanup unused resources in Features layer

* Update Roslyn.Diagnostics.Analyzers and remove RS0005 suppressions

* Move to SyntaxEditorBasedCodeFixProvider

* Remove some 'MyCodeAction's

* Remove more 'MyCodeAction's

* One more that's not named MyCodeAction

* Fix up changes between main and main-vs-deps

* Colorize async as keyword in some cases

* Few fixes

* Added a bunch of tests, where async can never be a keyword, moved logic one level up

* Fix typo

* Note auto-default merged in feature status doc (#60564)

* Update PublishData.json for 17.3 P1 (#60559)

* Fix formatting

* Added case with equals syntax, moved logic to a separate method

* Add Rebuild badge to README (#60298)

* Avoid using --blame-crash with CollectDumps

This flag causes the test harness to attach ProcDump, which removes our
ability to collect heap dumps on crash using Windows' built-in
functionality.

* Ensure current OOP calls for the same solution-checksum can share the same OOP solution computation

* Update src/Workspaces/Remote/ServiceHub/Services/DocumentHighlights/RemoteDocumentHighlightsService.cs

* Update src/Workspaces/Remote/ServiceHub/Services/SemanticClassification/RemoteSemanticClassificationService.cs

* Revert name

* Update tests

* Fix

* Add comment

* Add comment

* Update src/Workspaces/Remote/ServiceHub/Services/CodeLensReferences/RemoteCodeLensReferencesService.cs

* fix grammar

* Formatting

* Revert

* revert

* Revert

* Fix the Compiler VSIX extension so it works with CPS projects again

This has been broken for quite some time. We were MEF importing
a type that was no longer a MEF part, and referencing very old
reference assemblies that needed to be updated as a part of responding
to that original breaking change.

* Make NotificationOption2 a serializable struct (#60573)

* Update status for UTF8 literals and checked operators (#60587)

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1700800

* Simplify

* Simplify

* Simplify

* Simplify

* [LSP] Modify semanticTokens `isFinalized` logic (#60484)

* try/finally

* Simplify

* Move comment

* Simplify

* Doc

* Doc

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033

* Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 1701033

* Workspace config options (#59790)

* REnames

* Expand tuple

* Rename parameter

* Use deconstruction

* Fix merge from main

* Do not assert we are on the main thread in the constructor

* Add support for unsafe local functions in IDE0062 code fix (#59297)

* Track "numeric IntPtr" feature (#60579)

* Address review comment

* Add helpers

* Remove unneeded IVTs

* Simplify

* Simplify

* Pause computation of navbar items when a buffer is not visible

* Rename

* PR feedback part 1

* Change insertion branch

* Update PublishData.json

* PR feedback part 2

* lint

* Implement handling of rename intent (#59410)

* Implement handling of rename intent

* Use documentId instead of URI

* Move record definition up top

* feedback

* Address feedback

* Remove unused files in CodeStyle layer

* Remove unused resources in CodeStyle layer

* Changed algorithm of detecting IAsyncEnumerable and IAsyncEnumerator, reverted some refactoring

* Got rid of IsSystemRuntimeOrMscorlibAssembly method

* Fix crash when combining reordered arguments with params array (#60622)

* Fix string

* Always use text edits in completion for correctness (#60466)

* Filter down to task-like types when in an async context

* Update providers

* Cleanup

* Revert

* Revert

* Revert

* Simplify

* Restore logic

* Update test

* Pull feature-specific APIs out of ISyntaxFacts

* Extract out IBlockFacts out of ISyntaxFacts

* Simplify

* Instrument ReferenceCachingCS for flakiness (#60585)

* Fix our INavigableSymbol to not root an entire solution-snapshot

* Remove the TEmporaryWorkspace entirely from the RemoteWorkspace code.

* Lint

* Fixed adding a redundant blank line when suppressing with local attribute

* [main] Update dependencies from dotnet/source-build-externals (#60359)

[main] Update dependencies from dotnet/source-build-externals

* Fix

* Added more tests & refactoring

* Clean up syntax context

* Clean up syntax context

* Clean up syntax context

* Clean up syntax context

* Simplify

* Delay starting the work to scan for todo-items

* move properties

* Cleanup

* Cleanup

* Update tests

* Fixup

* Run continuation to dispose of cancellation token source (#60653)

* Run continuation to dispose of cancellation token source

* Remove cancellation token and execute synchronously

* Update src/Features/LanguageServer/Protocol/Handler/RequestExecutionQueue.cs

Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>

Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>

* Global indentation options - take 2 (#60565)

* Revert "Revert "Global indentation options (#59679)" (#60199)"

This reverts commit ab57ce8.

* Move IFormattingInteractionService to Editor Features and add inferred indentation detection to its implementation.
Move GetFormattingChangesOnTypedCharacterAsync, GetFormattingChangesOnPasteAsync to ISyntaxFormattingService - these do not depend on the editor.

* Test fix

* Update struct field definite assignment tests

* Restore CodeStyle test projects

* Lint

* Fallout

* Pass options to FixAllAsync, simplify CodeAction registration (#60665)

* Trim unnessasary leading lines when removing usings (#60672)

* Formatting and code generation options (#60127)

* Remove duplicate package references (#60658)

* Remove duplicate package references

* Delete additional Tools.props

* Update for definite assignment changes

Co-authored-by: Cyrus Najmabadi <cyrusn@microsoft.com>
Co-authored-by: Joey Robichaud <jorobich@microsoft.com>
Co-authored-by: CyrusNajmabadi <cyrus.najmabadi@gmail.com>
Co-authored-by: DoctorKrolic <mapmyp03@gmail.com>
Co-authored-by: David Barbet <dabarbet@microsoft.com>
Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
Co-authored-by: Youssef1313 <youssefvictor00@gmail.com>
Co-authored-by: DoctorKrolic <70431552+DoctorKrolic@users.noreply.github.com>
Co-authored-by: Manish Vasani <mavasani@microsoft.com>
Co-authored-by: Jason Malinowski <jason.malinowski@microsoft.com>
Co-authored-by: Rikki Gibson <rigibson@microsoft.com>
Co-authored-by: Allison Chou <allichou@microsoft.com>
Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com>
Co-authored-by: Tomáš Matoušek <tmat@users.noreply.github.com>
Co-authored-by: msftbot[bot] <48340428+msftbot[bot]@users.noreply.github.com>
Co-authored-by: Julien Couvreur <jcouv@users.noreply.github.com>
Co-authored-by: Gérald Barré <meziantou@users.noreply.github.com>
Co-authored-by: Jonathon Marolf <jmarolf@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
Co-authored-by: Fredric Silberberg <frsilb@microsoft.com>
davidwengier added a commit to dotnet/razor that referenced this pull request Jul 8, 2024
@davidwengier
Explicitly pass formatting options to Roslyn APIs (via External Acces…
b17a0e8 
…s) (#6166)

Requires:
- [x] dotnet/roslyn#59679
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasonmalinowski jasonmalinowski jasonmalinowski left review comments

@davidwengier davidwengier davidwengier approved these changes

@333fred 333fred 333fred approved these changes

@JoeRobich JoeRobich Awaiting requested review from JoeRobich

Assignees
No one assigned
Labels
Area-IDE
Projects
None yet
Milestone
17.2.P3
Development

Successfully merging this pull request may close these issues.
5 participants
@tmat @jasonmalinowski @davidwengier @333fred @allisonchou